From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 27 Jun 2008 13:15:11 +0000 (+0100)
Subject: hvmloader: Set up any Intel ICH for legacy IDE.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14192^2~28
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=9a5fd91e50f81917371115c79147b87d6b603da1;p=xen.git

hvmloader: Set up any Intel ICH for legacy IDE.
Signed-off-by: Li Zhang <li.zhang@intel.com>
---

diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c
index 68385cbfa5..e98e31b3ea 100644
--- a/tools/firmware/hvmloader/hvmloader.c
+++ b/tools/firmware/hvmloader/hvmloader.c
@@ -206,10 +206,12 @@ static void pci_setup(void)
             pci_writew(devfn, 0x3d, 0x0001);
             break;
         case 0x0101:
-            /* PIIX3 IDE */
-            ASSERT((vendor_id == 0x8086) && (device_id == 0x7010));
-            pci_writew(devfn, 0x40, 0x8000); /* enable IDE0 */
-            pci_writew(devfn, 0x42, 0x8000); /* enable IDE1 */
+            if ( vendor_id == 0x8086 )
+            {
+                /* Intel ICHs since PIIX3: enable IDE legacy mode. */
+                pci_writew(devfn, 0x40, 0x8000); /* enable IDE0 */
+                pci_writew(devfn, 0x42, 0x8000); /* enable IDE1 */
+            }
             break;
         }